projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ba28b64
)
(vc-update): Fix bug: Specify branch tip as vc-checkout REVISION.
author
Thien-Thi Nguyen
<ttn@gnuvola.org>
Fri, 1 Feb 2008 05:49:49 +0000
(
05:49
+0000)
committer
Thien-Thi Nguyen
<ttn@gnuvola.org>
Fri, 1 Feb 2008 05:49:49 +0000
(
05:49
+0000)
lisp/vc.el
patch
|
blob
|
history
diff --git
a/lisp/vc.el
b/lisp/vc.el
index e7fc52b5019001394c2a024b42eb91e9d127ba83..e221044b769e803a1d3bf43ea0a75b7f8c11ee99 100644
(file)
--- a/
lisp/vc.el
+++ b/
lisp/vc.el
@@
-2597,7
+2597,7
@@
the current branch are merged into the working file."
(vc-buffer-sync nil)
(let ((file buffer-file-name))
(if (vc-up-to-date-p file)
- (vc-checkout file nil
""
)
+ (vc-checkout file nil
t
)
(if (eq (vc-checkout-model file) 'locking)
(if (eq (vc-state file) 'edited)
(error